From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 30 Apr 2001 12:56:59 +0000 (+0000)
Subject: (rmail-message-regexp-p): Yet another fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40521
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=15f785fc861cceaceae3c047ea730b4912b03953;p=emacs.git

(rmail-message-regexp-p): Yet another fix.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 5d5a1c494f2..62ad4f6b27f 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2507,15 +2507,18 @@ or forward if N is negative."
 	      (forward-line 2)
 	      ;; If there's a Summary-line in the (otherwise empty)
 	      ;; header, we didn't yet get past the EOOH line.
-	      (if (looking-at "^\\*\\*\\* EOOH \\*\\*\\*\n")
-		  (forward-line 1))
+	      (when (looking-at "^\\*\\*\\* EOOH \\*\\*\\*\n")
+		(forward-line 1))
 	      (setq beg (point))
 	      (narrow-to-region (point) end))
-	    (rfc822-goto-eoh)
+	    (progn 
+	      (rfc822-goto-eoh)
+	      (setq end (point)))
 	  (setq beg (point))
-	  (search-forward "\n*** EOOH ***\n" end t))
+	  (search-forward "\n*** EOOH ***\n" end t)
+	  (setq end (1+ (match-beginning 0)))))
 	(goto-char beg)
-	(re-search-forward regexp end t)))))
+	(re-search-forward regexp end t))))
 
 (defvar rmail-search-last-regexp nil)
 (defun rmail-search (regexp &optional n)